Merge branch 'master' of git+ssh://alioth-git/git/debian-science/packages/pcl

diff --cc debian/control
index 098fb6294ba47b6b2c5cd7e85dc8ee7a80edfe19,9fbf23fbf57fbe7ae0c9612a801b0d04e721b7ef..1e18d736849aca0c236cf0146c7d04645d31070e
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -22,9 -22,8 +22,9 @@@ Build-Depends: debhelper (>= 9)
               libopenni-dev,
               libqt4-opengl-dev,
               libusb-1.0-0-dev,
 +             freeglut3-dev, 
               libvtk5-qt4-dev
- Standards-Version: 3.9.5
+ Standards-Version: 3.9.6
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/pcl.git
  Vcs-Git: git://anonscm.debian.org/debian-science/packages/pcl.git
  Homepage: http://www.pointclouds.org/

diff --cc debian/rules
Simple merge